dateMenu: Update visibility syncing for new dateMenu layout

The code here before was trying to play hierarchy tricks to
figure out how to show / hide the events list, which broke
when we rearranged how the date menu was laid out. Simplify
the code here to not be so tricky, and update the CSS to
match the new designs.

https://bugzilla.gnome.org/show_bug.cgi?id=702849

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 02168465ee7fca8139559a6c71cb3921e8abf972..72e14773c14367292b6b938d00db32e86fa09d8b 100644 (file)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -1154,11 +1154,6 @@ StScrollBar StButton#vhandle:active {
 
 /* Calendar popup */
 
-#calendarArea {
-    /* this is the total width of the popup */
-    width: 720px;
-}
-
 .calendar-vertical-separator {
     -stipple-width: 1px;
     -stipple-color: #505050;

diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 08c644aa4c562bf03e524d2d2a5b0133fb1d64df..85a0aded16d94bda24ae7f7e7081c136de26b655 100644 (file)
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -153,15 +153,14 @@ const DateMenuButton = new Lang.Class({
         this._openClocksItem.actor.visible = visible &&
             (this._getClockApp() != null);
         this._separator.visible = visible;
+        this._eventList.actor.visible = visible;
         if (visible) {
-          let alignment = 0.25;
-          if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
-            alignment = 1.0 - alignment;
-          this.menu._arrowAlignment = alignment;
-          this._eventList.actor.get_parent().show();
+            let alignment = 0.25;
+            if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
+                alignment = 1.0 - alignment;
+            this.menu._arrowAlignment = alignment;
         } else {
-          this.menu._arrowAlignment = 0.5;
-          this._eventList.actor.get_parent().hide();
+            this.menu._arrowAlignment = 0.5;
         }
     },